Skip to content
This repository has been archived by the owner on Jan 6, 2022. It is now read-only.

Integration test improvements #453

Merged
merged 17 commits into from Jan 30, 2018
Merged

Integration test improvements #453

merged 17 commits into from Jan 30, 2018

Conversation

martinheidegger
Copy link
Collaborator

When trying to fix the tests for #450 I noticed some problems with how the test system is setup. In order to not bloat #450 let me push here a separate PR.

@martinheidegger martinheidegger changed the title [WIPIntegration test improvements [WIP] Integration test improvements Jan 24, 2018
Copy link
Collaborator

@juliangruber juliangruber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is great! some of those definitely have been annoying. 🙇

@martinheidegger martinheidegger changed the title [WIP] Integration test improvements Integration test improvements Jan 30, 2018
@martinheidegger
Copy link
Collaborator Author

(re)Based on #456 and while I tried to get appveyor to work, but it seems like its a deeper-rooted issue (with dat or nodejs) that I couldn't get fixed.

ref. nodejs/help#1083 and nodejs/node#18391

@juliangruber
Copy link
Collaborator

Wow, rough :|

@martinheidegger
Copy link
Collaborator Author

I think it's still worth merging as is

@juliangruber
Copy link
Collaborator

gotcha! can you look at the conflicts? then +1 to merging

@martinheidegger
Copy link
Collaborator Author

rebased on master, not sure what the problem might have been?!

@juliangruber juliangruber merged commit d8ef48a into dat-ecosystem-archive:master Jan 30, 2018
@juliangruber
Copy link
Collaborator

Awesome, thank you!

@martinheidegger martinheidegger deleted the test_improvements branch January 30, 2018 10:12
@martinheidegger martinheidegger restored the test_improvements branch January 30, 2018 10:15
@martinheidegger
Copy link
Collaborator Author

Would it be possible to merge this branch with a merge commit? To keep the commit log?

@juliangruber
Copy link
Collaborator

doesn't it still have the commit log in the description? d8ef48a

Or do you want to see more in the history, then I'm ok with that too :)

@martinheidegger
Copy link
Collaborator Author

I asked for it in order to be able to blame. I understand the current way and I am on the fence about which one is better

@martinheidegger
Copy link
Collaborator Author

Have thought about this a little more (shoulda done that before commenting). The current statement is fine. I will keep the branch alive in order someone wants to reference it.

@juliangruber
Copy link
Collaborator

Ah, I see what you're saying! Yeah I think just using git a merge commit would have been better, but with the extra information GitHub provides this gives a good balance between brevity and inspectability

@martinheidegger
Copy link
Collaborator Author

Smaller commits in future 😄

@iosefa iosefa deleted the test_improvements branch May 22, 2018 15:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants